From: Rob Browning Date: Mon, 10 Nov 2025 18:27:00 +0000 (-0600) Subject: Mark esh-proc-test/kill-pipeline as unstable for now X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=1dc06aa85fe442f4613da07848ea67c42c0256ac;p=emacs.git Mark esh-proc-test/kill-pipeline as unstable for now Skip it since it fails sporadically on at least s390x. Add 0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch to address the issue. --- 1dc06aa85fe442f4613da07848ea67c42c0256ac diff --cc debian/.git-dpm index 2bbd969237d,00000000000..ed1f97173f1 mode 100644,000000..100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@@ -1,8 -1,0 +1,8 @@@ +# see git-dpm(1) from git-dpm package - 60a4ccd482d6856c7aa1cecf0d9ab2461c27b96d - 60a4ccd482d6856c7aa1cecf0d9ab2461c27b96d ++d4a154eec2184afba41a1f558993427baa57e2d9 ++d4a154eec2184afba41a1f558993427baa57e2d9 +a24283bc41f2e3b3ba14c420f86f7ec581624a82 +a24283bc41f2e3b3ba14c420f86f7ec581624a82 +emacs_30.2+1.orig.tar.xz +5f56965565248d570f1fd86458b57c8a75960ebf +31109076 diff --cc debian/patches/0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch index 00000000000,00000000000..328e7bcdfec new file mode 100644 --- /dev/null +++ b/debian/patches/0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch @@@ -1,0 -1,0 +1,114 @@@ ++From d4a154eec2184afba41a1f558993427baa57e2d9 Mon Sep 17 00:00:00 2001 ++From: Rob Browning ++Date: Mon, 10 Nov 2025 12:20:23 -0600 ++Subject: Mark esh-proc-test/kill-pipeline as unstable for now ++ ++Currently fails on at least s390x from time to time. It doesn't take ++long to reproduce via ++ ++ (set -ex; while true; do make lisp/eshell/esh-proc-tests EMACS_TEST_VERBOSE=true; done) ++ ++from debian/build-lucid/test/. The failure looks like this: ++ ++ passed 3/24 esh-proc-test/exit-status/with-stderr-pipe (0.101971 sec) ++ Test esh-proc-test/kill-pipeline backtrace: ++ signal(ert-test-failed (((should (string-match-p (rx bos (32 (or "in ++ ert-fail(((should (string-match-p (rx bos (32 (or "interrupt" (seq " ++ (if (unwind-protect (setq value-154 (apply fn-152 args-153)) (setq f ++ (let (form-description-156) (if (unwind-protect (setq value-154 (app ++ (let ((value-154 'ert-form-evaluation-aborted-155)) (let (form-descr ++ (let* ((fn-152 #'string-match-p) (args-153 (condition-case err (list ++ (let ((output-start (eshell-beginning-of-output))) (eshell-kill-proc ++ (let ((ert--infos (cons (cons "Command logs: " #'eshell-get-debug-lo ++ (save-current-buffer (set-buffer eshell-buffer) (let ((ert--infos (c ++ (unwind-protect (save-current-buffer (set-buffer eshell-buffer) (let ++ (let ((eshell-buffer (eshell t))) (unwind-protect (save-current-buff ++ (let ((process-environment (cons "HISTFILE" process-environment)) (e ++ (progn (let ((process-environment (cons "HISTFILE" process-environme ++ (unwind-protect (progn (let ((process-environment (cons "HISTFILE" p ++ (let* ((coding-system-for-write nil) (temp-file (file-name-as-direct ++ (save-current-buffer (let* ((coding-system-for-write nil) (temp-file ++ #f(lambda () [t] (let ((value-145 (gensym "ert-form-evaluation-abort ++ #f(compiled-function () #)() ++ handler-bind-1(#f(compiled-function () # ++ ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ++ ert-run-test(#s(ert-test :name esh-proc-test/kill-pipeline :document ++ ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m ++ ert-run-tests((not (or (tag :unstable) (tag :nativecomp))) #f(compil ++ ert-run-tests-batch((not (or (tag :unstable) (tag :nativecomp)))) ++ ert-run-tests-batch-and-exit((not (or (tag :unstable) (tag :nativeco ++ eval((ert-run-tests-batch-and-exit '(not (or (tag :unstable) (tag :n ++ command-line-1(("-L" ":/home/rlb/emacs/debian/build-src/test" "-l" " ++ command-line() ++ normal-top-level() ++ Test esh-proc-test/kill-pipeline condition: ++ Command logs: command: "sh -c 'while true; do echo y; sleep 1; done' | sh -c 'while true; do read NAME; done'" ++ ++ ---------------------------------------- ++ [process] started external process `sh' ++ ++ /usr/bin/sh -c while\ true\;\ do\ read\ NAME\;\ done ++ ---------------------------------------- ++ [process] started external process `sh<1>' ++ ++ /usr/bin/sh -c while\ true\;\ do\ echo\ y\;\ sleep\ 1\;\ done ++ ---------------------------------------- ++ [process] received output from process `sh<1>' ++ ++ y ++ ++ ---------------------------------------- ++ [process] forwarding output from process `sh<1>' ++ ++ y ++ ++ ---------------------------------------- ++ [process] sentinel for external process `sh<1>': "killed ++ " ++ ---------------------------------------- ++ [process] i/o busy for process `sh<1>' ++ ---------------------------------------- ++ [process] sentinel for external process `sh-stderr': "finished ++ " ++ ---------------------------------------- ++ [process] finished external process `sh-stderr' ++ ---------------------------------------- ++ [process] sentinel for external process `sh': "killed ++ " ++ ---------------------------------------- ++ [process] finished external process `sh' ++ (ert-test-failed ++ ((should ++ (string-match-p (rx bos ... eos) ++ (buffer-substring-no-properties output-start ...))) ++ :form ++ (string-match-p "\\`\\(?:\\(?:interrupt\\|killed.*\\)\n\\)?\\'" ++ "/home/rlb/emacs/debian/build-lucid/test $ sh -c 'while true; do echo y; sleep 1; done' | sh -c 'while true; do read NAME; done'\n") ++ :value nil)) ++ FAILED 4/24 esh-proc-test/kill-pipeline (0.003864 sec) at ../../build-src/test/lisp/eshell/esh-proc-tests.el:300 ++ Error running timer: (error "Selecting deleted buffer") ++ passed 5/24 esh-proc-test/kill-pipeline-head (0.102912 sec) ++ passed 6/24 esh-proc-test/kill-process/background-prompt (0.001595 sec) ++ [sleep]+ Done (/usr/bin/sleep 100) ++ passed 7/24 esh-proc-test/kill-process/foreground-only (0.203248 sec) ++ passed 8/24 esh-proc-test/kill-process/redirect-message (0.001616 sec) ++ passed 9/24 esh-proc-test/output/remote-redirect (0.160153 sec) ++--- ++ test/lisp/eshell/esh-proc-tests.el | 4 ++++ ++ 1 file changed, 4 insertions(+) ++ ++diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el ++index 06a3433cb45..7fadba77f53 100644 ++--- a/test/lisp/eshell/esh-proc-tests.el +++++ b/test/lisp/eshell/esh-proc-tests.el ++@@ -300,6 +300,10 @@ esh-proc-test/kill-process/redirect-message ++ (ert-deftest esh-proc-test/kill-pipeline () ++ "Test that killing a pipeline of processes only emits a single ++ prompt. See bug#54136." +++ :tags '(:unstable) +++ ;; Sporadically fails on at least s390x. Fairly easy to see via +++ ;; (set -ex; while true; do make lisp/eshell/esh-proc-tests EMACS_TEST_VERBOSE=true; done) +++ ;; run from test/. ++ (skip-unless (and (executable-find "sh") ++ (executable-find "echo") ++ (executable-find "sleep"))) diff --cc debian/patches/series index 1cae13241d7,00000000000..4f952538d0f mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,23 -1,0 +1,24 @@@ +0001-Prefer-usr-share-info-emacs.patch +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch +0004-Adjust-documentation-references-for-Debian.patch +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch +0010-Mark-test-undo-region-as-unstable.patch +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch +0012-Add-inhibit-native-compilation.patch +0013-Rename-to-inhibit-automatic-native-compilation.patch +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch +0015-Change-native-comp-async-jobs-number-default-to-1.patch +0016-Change-native-comp-async-report-warnings-errors-to-s.patch +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch +0018-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch +0019-Boost-BASE_PURESIZE-in-attempt-to-fix-build-on-32-bi.patch +0020-Disable-server-tests-server-force-stop-keeps-frames-.patch +0021-Disable-emacs-module-tests.el.patch +0022-Add-public-interfaces-for-accessing-builtin-package-.patch +0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch ++0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch